Remove deprecated functions from GtkCalendar

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 80f67d32669f1d4e95c9ee70a59da1eb12a74334..355327ff17536f2cf94c981426a7e02e224c5a77 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -3499,22 +3499,6 @@ gtk_calendar_new (void)
   return g_object_new (GTK_TYPE_CALENDAR, NULL);
 }
 
-/**
- * gtk_calendar_display_options:
- * @calendar: a #GtkCalendar.
- * @flags: the display options to set.
- *
- * Sets display options (whether to display the heading and the month headings).
- * 
- * Deprecated: 2.4: Use gtk_calendar_set_display_options() instead
- **/
-void
-gtk_calendar_display_options (GtkCalendar             *calendar,
-                             GtkCalendarDisplayOptions flags)
-{
-  gtk_calendar_set_display_options (calendar, flags);
-}
-
 /**
  * gtk_calendar_get_display_options:
  * @calendar: a #GtkCalendar
@@ -3983,35 +3967,5 @@ gtk_calendar_get_detail_height_rows (GtkCalendar *calendar)
   return GTK_CALENDAR_GET_PRIVATE (calendar)->detail_height_rows;
 }
 
-/**
- * gtk_calendar_freeze:
- * @calendar: a #GtkCalendar
- * 
- * Does nothing. Previously locked the display of the calendar until
- * it was thawed with gtk_calendar_thaw().
- *
- * Deprecated: 2.8: 
- **/
-void
-gtk_calendar_freeze (GtkCalendar *calendar)
-{
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
-}
-
-/**
- * gtk_calendar_thaw:
- * @calendar: a #GtkCalendar
- * 
- * Does nothing. Previously defrosted a calendar; all the changes made
- * since the last gtk_calendar_freeze() were displayed.
- *
- * Deprecated: 2.8: 
- **/
-void
-gtk_calendar_thaw (GtkCalendar *calendar)
-{
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
-}
-
 #define __GTK_CALENDAR_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h
index 9648d25be1e01a328971cc62564251b668f7256b..c0eb1a0c4a5708a5d938244f67fa5638b9a86d9d 100644 (file)
--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@@ -176,11 +176,6 @@ void          gtk_calendar_set_display_options (GtkCalendar              *calendar,
                                             GtkCalendarDisplayOptions flags);
 GtkCalendarDisplayOptions
            gtk_calendar_get_display_options (GtkCalendar             *calendar);
-#ifndef GTK_DISABLE_DEPRECATED
-void      gtk_calendar_display_options (GtkCalendar              *calendar,
-                                        GtkCalendarDisplayOptions flags);
-#endif
-
 void      gtk_calendar_get_date        (GtkCalendar *calendar, 
                                         guint       *year,
                                         guint       *month,
@@ -199,11 +194,6 @@ void       gtk_calendar_set_detail_height_rows (GtkCalendar    *calendar,
 gint       gtk_calendar_get_detail_width_chars (GtkCalendar    *calendar);
 gint       gtk_calendar_get_detail_height_rows (GtkCalendar    *calendar);
 
-#ifndef GTK_DISABLE_DEPRECATED
-void      gtk_calendar_freeze          (GtkCalendar *calendar);
-void      gtk_calendar_thaw            (GtkCalendar *calendar);
-#endif
-
 G_END_DECLS
 
 #endif /* __GTK_CALENDAR_H__ */